update HE and VPI refs & update support lib

android support lib rev12
format, inline, org imports