Add proper keep list generation.

Change-Id: I904336e64316318a1a7808c593fc9dfd10019820
fix merge for [fix build] commit

Change-Id: I8f469e0aba1952de4711fb3ae030f6cb8f182ebe
mods to build pa for jellybean

Change-Id: I06a9126fe56cf26fd8c663ff03a26794aea180a3