Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev...
Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am: ffe1c2a2" into pi-dev-plus-aosp
am: c13bf777
Change-Id: I1d93eb9fadc99f578e7162a6aae82d6eb612a3b8