Merge "Remove several nonexisting vndk sp private libs" am: becaf919d4
am: ca0c04488f

Change-Id: I121389598b9ca41439ff2a326948445f8ab02d1a