Android mainline 10.0.0 release 4
fix: incorrect output path
am: f840ab0879

Change-Id: I547ecbff37a1b3dc194bd2c84e6254899f6a1c7c