Merge "Add VNDK APEX path as permitted paths of sphal" am: 835742ef39
am: 50975bebdf

Change-Id: I644af89a8452d24acab7381a017200cfd81cfa1e