simplify vendor props

Change-Id: I46b9bec5a2e2ec8e0fb32421df90ebdc09f0ab7d
reorganize prebuilts

Change-Id: Idcbd463cf714c079bbb42f4b4de0c94ac5e14042
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1