Use shared version of vndk am: 36fe83ba23
am: fdaddf6789

Change-Id: Ib67a3e8ad2213082006714d06e96d889c30d6e25