Merge "resolve merge conflicts of ec7e2a16 to master"

#include <vector>

#include <android/log.h>

#include <log/log.h>

#include <utils/Log.h>

#include "PdfUtils.h"

 */

#define LOG_TAG "OpenGLRenderer"

#include "android/log.h"

#include "jni.h"

#include "GraphicsJNI.h"

#include "core_jni_helpers.h"

#include "log/log.h"

#include "Animator.h"

#include "Interpolator.h"

#include <log/log_event_list.h>

#include <log/log.h>

#include "JNIHelp.h"

#include "core_jni_helpers.h"

#include "jni.h"

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#include "JankTracker.h"

#include <errno.h>

#include <inttypes.h>

#include <sys/mman.h>

#include <algorithm>

#include <cmath>

#include <cstdio>

#include <limits>

#include <sys/mman.h>

#include <cutils/ashmem.h>

#include <log/log.h>

#include <algorithm>

#include <cstdlib>

#include <log/log.h>

#include <cutils/compiler.h>

#include <cutils/properties.h>

#include <log/log.h>

namespace android {

namespace uirenderer {