Merge "Add vndk-lib-extra-list-current.txt" am: 6a226c1aca
am: 5e1ab1043a

Change-Id: I992d6eacc56c6671f54fa2af4cf888ee3bed1c8b