Merge "Exposing flickerlib classes and layer tracing to sysui" am: e25075b2fb
am: f19fcb5048

Change-Id: I281764bab937ff4a71ed0572a648e4f08738a5d9