Merge changes from topics "hiddenapi-soong", "hostdex_install"
am: d61a1aba36

Change-Id: I1e7a8806821414aa68b7309de79668ee6cd86d68